Merge "add NonNull annotation to API" am: 56c9d22970 am: 69e802e6e6
am: 8d19949c4c

Change-Id: I92bad21050b4396d1bb3588cd42d78a1c662903c