Merge changes from topic "adbwifi-system-core" am: e20d3a006a

Change-Id: If686ba95502883a9fa47be6eb91e0ecc75e74a38