Merge 694e4bf2d698c4ed2ff41e1ed1d6f804fa988eb0 on remote branch

Change-Id: I8e94d6a245a86cdecb7d89a96f9a4ef3be2e1862