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

Change-Id: I8a42f01bb83e944bb724fb2d10f2daca8965ee25