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

Change-Id: I45efdd6ab987c2d7823a0ee6cb934521edbf6be3