Merge fa69d1f59e6f5cae46db6d312361625188616e85 on remote branch

Change-Id: Ic005c52b7bf7037e13de176e56f60c9dcd226969