Merge 058b4a1702209887fc6c33e666b2643a25561fe3 on remote branch

Change-Id: I6263b4efa140668bf89e48e524c5e1b728ad8ced