Merge 4c466f0c7ea01237d013eb15afbaa283c6244c25 on remote branch

Change-Id: I86b3adf3207889cd47a93463182ef709e771bd42