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

Change-Id: If1785ca58a770e5554cbc6b18d744c914478225e