Merge "Merge \\"Add missing null checks\\" into nyc-dev am: 02e391585d am: 8a953d02d9" into nyc-mr1-dev-plus-aosp