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

Change-Id: I8a42f01bb83e944bb724fb2d10f2daca8965ee25