Merge c96d605738ebeda0ddf52f2714fd24b849d6ab0b on remote branch

Change-Id: Idcbccdb0c66e729285ba1227dc4ace6d5d1fb28f