Merge 7e6ac1268d50169fb1419787201f99ed6e094d08 on remote branch

Change-Id: I7a6e64c5ebab9aba60c03eff842b40ef5b923db6