Merge a2c882ab5231322066ae51f63b69b2407ff7aa1b on remote branch

Change-Id: Ic9a3eac5cd3e33ca374cfd7eda6151d0f830d7d8