Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: d7f137ecb7 am: 72a61be33b
am: f80b69635a

Change-Id: I121dedc746e6db36c8e25fa019aa5f10c3ee22f6