Merge "[AWARE] Update comments on transmit followup status codes" am: 2eff5c85fe
am: 6083ae3a53

Change-Id: Ia3e184832465c0a476307ab4dc4d2cbb37d8aa61