Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
am: 911a23ccd8

Change-Id: I5cf0084230838f43eea342d0083f649b3a0fc5f6