Merge 9a27d75355a4afaf8495825b19c6fab762fec55c on remote branch

Change-Id: I523bb7d8da6fb06c34600181ff9ac000f8eaa939