Merge commit 'FETCH_HEAD^' into qemu-flag
am: cac43e9da3

Change-Id: I8fc42f78080a1981464be76292c392dd8cb60115