Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b am: 4f9328119c am: 01c87cf712
am: 36aa82dda5

Change-Id: Id311c7cb25b4826fa344375d87db358fbaf62e10