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

Change-Id: I723c22a0b7e76808cf60667ef7b2fcffac8ce71c