Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b am: 4f9328119c
am: 01c87cf712

Change-Id: I7552ca2f7ee9e0d548b46dde10a74cdbea34e0f1