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

Change-Id: I1e973f3f484967234cf24fecbda06fd1df50c15b