Merge 675953339f7f0612b306a010c43bf7419cfa7bb3 on remote branch

Change-Id: Ie1891eb26c56f259acf079a70319db934d3947b8