Merge "Return NonNull and other imports" into stage-aosp-master