Merge 3f132db3f0fb2b04b5dd9b1409beacf90e144977 on remote branch

Change-Id: Iafec47c6844b7d07059bfdb8c06d6c17a14fe53d