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