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

Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989