Merge 7bacf1b54f4f01856bc395981cb5df448798216f on remote branch

Change-Id: I238e8fbd66cf7f0c2c636ad9a6ccd8de45ab684f