Merge 6dcf4ac0b03fcafd29fd45a3142a311e92954f7a on remote branch

Change-Id: I8203ff13de5ddd4127ade6c60a6aecc9b546c7a6