Merge 8d920eed71f7722d2b1a477978e62843acac67f8 on remote branch

Change-Id: Ia925e8988e4a58434c29fa0476b226ddb3d67fdd