Merge d7ef765af9cb7f3a1447890ae1866cdf16539690 on remote branch

Change-Id: I5dfc09e90e5b2d078d58c17f68284024ec52e76c