Merge ad59e2cd11668aa5de8662a82bdfd1131f72c4f6 on remote branch

Change-Id: I2564e708b0c32fd1b8c91aa0ca61b5596a6abc80