Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: a1e5dccd6a
am: c593450051

Change-Id: Ia2043ac83e22ba6cc2317a94c7c222e01d35472a