Merge be2728e369e34ff4c1ef95d8193efdddba7e1a90 on remote branch

Change-Id: Ie21b8e838ff9eb13712e6eb73b267a95b3ce7dad