Merge f47c649bf0e3f6315737a73c5609d3a072b8a629 on remote branch

Change-Id: I73ad3b2a1a68f18d6f8e509ac12186ae89d7b85a