Merge 0858d8c42fd2e2700b1a55d7f538edaf880172a8 on remote branch

Change-Id: I886ec762b27c9952f03f319aca46f2f713fe42ee