Merge d1dd7839d4bd4386d719da5bfea9a3c31560ca9c on remote branch

Change-Id: I76193b4ecfac5f1681a356cabaa8fc165ebbbbfa