Merge 4cc0523d1f6e2b6c45b49d5a47ad93cd79eced1c on remote branch

Change-Id: I427f0c0499ba66543a76b409da801b8fb513b90d