Merge 647d1fa10e572b55952d790d86273ba168877902 on remote branch

Change-Id: I15950e8d98e11c3748203470894d59679eeb304a