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

Change-Id: Ic584b85e710fbb2486cab27861adedd97789f73b