Merge 86cd738b679631a59e7f4d405b56303579cb2979 on remote branch

Change-Id: I73a05db06402bc9fd811a6380957e0de7ea799db