Merge 22549c64060af94adc3db173cf949ce967faef15 on remote branch

Change-Id: I9dd680ba079c855dd5f1b6eebd2090e651170727