Merge fe6e6b516955213012a22c7d106a7e638cf6babe on remote branch

Change-Id: Ib5512464eb2a52915993324b8dc1d514d8b40fcd