Merge ad06ab7d7cf39b73d59aebd27bf6945c8714d4da on remote branch

Change-Id: I811c16aebe60f95ee03f7259181774a76f77d5a1