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

Change-Id: Ifa8ca4f0ae7ceb7a7e226820f395d6cf15d7a870