Merge "Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c20 am: 91a0be4e am: 9e7bf0d0" into rvc-qpr-dev-plus-aosp