Merge 507370470c224dd6b81aefe37e99ea6141b4f09b on remote branch

Change-Id: I9a19d460d577df8269151898ac260e610a4abf1b