Merge e7d8c8307b38632a733e129e4781ba0a43d145e5 on remote branch

Change-Id: Ic3d8eb6bfb807274c641d700afc98207b9c1503a