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

Change-Id: I0c9f9cea0afaf221506906b79c18b562caba355f