Merge changes from topic "adbwifi-syscore-base" am: fd8b4ea996 am: 2f7c2255fa am: 59fd702f01

Change-Id: Idd6ef31368cf99986b040c113b980c914b339211