Merge 6b74d6c8822e3d5dfb86448af794bc831d9b8cef on remote branch

Change-Id: I5f1b900c29c76574f294db6085819e59b2bf67ce