Merge 9450e3843a13239228034a648c7d70e8f002b8a1 on remote branch

Change-Id: I8f0b09d1184458dc968cb80e497842de926a77cd