Merge dcd3f62fac1af5388b05a18293996d39f056d6da on remote branch

Change-Id: Ifb1eeef63c9c1c3d9eff10541a454843ad775b2c