Merge e66f4ef77da66ee4be68b95bafcc3404ea65d3d6 on remote branch

Change-Id: I056f229ac1edebbb7eb3c52e34df4d1346d076f8