Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c20 am: 3c642347 Change-Id: I122287c3d281bf71bfac600229e107acf9b5052e