Merge c2a9cd914c531103ae6984705adb460e86426b16 on remote branch

Change-Id: Ic55189b99a9f64f59e04d8480b6d91938d63a10d