Merge 6ddf76435c88080312f49e6eea49f3266ef55f20 on remote branch

Change-Id: I6bcff7592b54ba3f857db4d43e8260fb1937d497