Merge "add NonNull and Nullable annotation to APIs" am: c931e9b0c0 am: 715c2d87cc
am: 3bc4573765

Change-Id: I35e81dcc8e091e91cf335587849c596134781a7c