Merge 2a032fa55eadafefbcd9973f6ac5f979ffc54620 on remote branch

Change-Id: Ic1efa63bfd2061c1d0019b9d389b8042ff4338b5