Merge remote-tracking branch 'origin/master' into merge-branch

Change-Id: Ic237c09131f6579f3df1a3a10ba1e5f7a3d42bde