Merge 863d927aa5143a8ed9807b4024b84df5f661781a on remote branch

Change-Id: I8510176977f5093b94aded066d8ab85983560fc7