Merge 5a78d4c48ef4d4ddda31fc312777691c581541f2 on remote branch

Change-Id: I96a5ac91f510895cfc3afc0f6d63d389bb84b2ae