Merge remote-tracking branch 'upstream/xpe9' into HEAD

Change-Id: Iebf801780e03c71dacfe2df8774141915e3f8c3c