Merge 62ba1cfc05d1df9c8dbe569c5f617ec5296e7553 on remote branch

Change-Id: I91234d64260c2588d70a657871576616f186ac53