Merge a094dd9004a293113d6bbad20541c3bc5ee2941c on remote branch

Change-Id: If9eb7480707fab40b0a220e924c56a84f0af38a9