Merge 7904e8a481c25251260a668aeee48777aeaf3ba5 on remote branch

Change-Id: Ie03a78f2c1ec4c55c6b549396a8168239a3cf5fc