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

Change-Id: If56e54850f1dff9679e7ac0942dad88c7f43d70e