Merge commit 'd1808401' into manualmerge

Change-Id: Ie15d0b8eb2c03ecabf3002635bf1130c7050f07d