Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b26de94592 am: 99d893a486 am: 527bce9ce4
am: 5dca885968

Change-Id: I6af0ab21dfc7f43ac09aee0b43420e2e765910df