Merge 3217ef989cad0286fccc8215d45f4d720c1d5211 on remote branch

Change-Id: I01889f0b56e99763ae02da668a9bbdc1d83e7335