Merge 7174a2a8e7e860b18a4fc8ffec145f1f2b8068c3 on remote branch

Change-Id: If511f1186291b22875fac026380ed02b7612322a