Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27 am: 6619c84f7f
am: 431d4415e0

Change-Id: Ic66313bca08673e7bec89547d47cb435202530d5