Merge 25495145a8bda061336d6f862632e1a47c1feaa8 on remote branch

Change-Id: I11dc62d4c1cc1fd448342ed71574745ef310de2a