Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b450382267 am: 67835669c3
am: cad4c019a4

Change-Id: I344611e7c1f318236ba0252d8c98810457449353