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

Change-Id: If391b00e3e33e32c2de880f27bda245fc7a2a069