Merge 2ec6a74543b75c3d2a1fb523efc4a227cc0fae11 on remote branch

Change-Id: Idb6ec9b5beae103e34d29c69d87be668781a6ab5