Merge "add NonNull and Nullable annotation to APIs"
am: c931e9b0c0

Change-Id: I4ec29b409230a04be5897ccde9bb524dc1eadbdf