Merge "Merge "Revert "Adding issuer information to NAS Adjustments"" into qt-dev am: 95706d0c60 am: e694cab624" into qt-r1-dev-plus-aosp