Merge 6e62f964a632f0fd73dab89dc41a3736f9aa9b7b on remote branch

Change-Id: Ia98bc2e87f0a54388288eb07db9fa01092a4701b