Merge 081532cb6303140cb0217f8584639ccb5a7f2678 on remote branch

Change-Id: I352d804063f0cdd6edff4fa270ff2dfcd764198b