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

Change-Id: Ibd54891b6e5aa6d9d2f368d6f4bc17684c299fa9