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

Change-Id: I73acdd19a9cad040c0e63606f480e9c101ec1544