Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
am: 662f6b3adf

Change-Id: I2470120c9e33fac3f8f96e1de93238ae7e8df121