Merge c66f46a43d20e515165a9f0c05abc2d1dfe975b7 on remote branch

Change-Id: I97e8b7c5e2d025414bc528e05587c5aeaa896ad7