Merge e067c6a5f36347cc934a85462ce75789752df4fd on remote branch

Change-Id: Ic8158d2559707f2132260c0698dcae23f1950f92