not only the first one.

Patch by: Ma Bingbing
Review by: Andre Fischer
(cherry picked from commit 7daa651f)

Change-Id: Ibd8bf8c6f04785c93b7dae70b57fd9eb14623aaf