Merge changes from topic "adbwifi-system-core" am: e77d5c79ba am: 9cb81d3b8d

Change-Id: I3b2d9693f8f481a5c9e8386940b17cd35316e897