Merge a61e13980f224caed2f0cd6363a8c3fb316cb2e9 on remote branch

Change-Id: Ia68c48c16144c58d8faf36f681d31842313c24e6