Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk"
am: 50b0c33452

Change-Id: I43801ec6e435366a0e484bdcff05bb5415c8abff