Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: 09166485f7 am: dbc168c111 am: 874583b91b
am: b99427627b

Change-Id: I77c49de43f7a94a8e5e6310331473e2cd50aebb2