Merge commit 'e8c9e82d' into manualmerge

Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675