Merge "add NonNull annotation to API" am: fd2bb72030
am: 6131255e77

Change-Id: Id8fab7bd594db237c8353e3784a348688c602a85