Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: d0905e0b2c
am: 16a155788d

Change-Id: I0c1194bf0dfd09e556d0c4050f44b1df0eb03bae