Merge 5ef5a57960c7c2f0cfbe45593a9d16fdc6241111 on remote branch

Change-Id: I6835ede42c4178c075b5c0115cf9dfdf3877926e