Merge cd5247e5007eb8cc3b9810a5f923faad056e204f on remote branch

Change-Id: I106ed512377c620707c0076690b0491042bc7067