Merge 6af3ae32598d883c8814721048c51b96bbc3fcb1 on remote branch

Change-Id: I3dbcad9513d5642f48ac27b4e9b3d6ca69fe7cb6