Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043

Change-Id: I4f4245e81e82dbb44d43d6d5c67c71e317bc4d01