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

Change-Id: I3b2d9693f8f481a5c9e8386940b17cd35316e897