Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0b
am: d611cb9b25

Change-Id: Ib9527e947d8d199958f128f71c4f77bcc3f0d86c