Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: b698b3b5b9 am: 67230edb1c
am: 01d300c6bd

Change-Id: Id62c0fb6fe18eafe03db93401cf15225385f4107