Merge fd5ee2fb8ea26da5ba0b2f6757eb3fb452118d16 on remote branch

Change-Id: Ic9454cecbdeb6feff76fc344af9b0f21323235eb