Merge b977deb11adff9b191181bfba2a95c71c8f16a71 on remote branch

Change-Id: I428b1fd324cbba0243d59b8495257e26b66b4edd