Merge 06b961b5b37975997d2c52f16eab68ac860342df on remote branch

Change-Id: I9fc7a72f7c06473ec5bf12c08f07612656a304ec