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

Change-Id: I73ec8feea370c133e2da915ac14b8631396eea26