Merge "Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c20 am: 3c642347" into rvc-d1-dev-plus-aosp