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

Change-Id: Ib845b75e8ff53290d64c22f46ff201954bf9556c