Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c20 am: 91a0be4e Change-Id: I0dd2164e2886acf342ed57f2725f4a883d1b03db