Merge "add NonNull annotation to API"
am: fd2bb72030

Change-Id: Idf5a7df74815a9e339cf4313506f269ddbdce5d1