Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: d0905e0b2c am: 16a155788d
am: 343b2497ae

Change-Id: Ib61a378684e8a15b353411e7f62a059b206368b4