Merge changes from topic "adbwifi-syscore-base" am: fd8b4ea996 am: 2e06a1c40b

Change-Id: I4b2469bd24c51f718fd15b842a311926a82925f5