Merge 27377ffa11636075f65b030e63b8cf7238516163 on remote branch

Change-Id: Ifd5738b43292e7c7e746b259d936e638942a9230