Merge f102554eca50205a55947b046c2ac1ed8336bba4 on remote branch

Change-Id: Ibfc33caa9765c18074e02e528ce2fc6ea4be26b5