Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk
am: e0fb9b50e1

Change-Id: I8331df4e797fbda6d0cb1be656c065a6c9e5ef20