Merge 9a83d0ca646a0889e8cd47a9866bea40f1438845 on remote branch

Change-Id: Ia19fd522b0d9b795fb06b6ddad5f1e92387928c5