Merge 8a2c31c5e96aaf71835891ddb510a90179a7fe59 on remote branch

Change-Id: Icd24778bd9469a66b4db80a65e7f54bb7c0df566