Merge "Merge "Null check." into nyc-dev am: fc1bb74186 am: 1ca6867e35" into nyc-mr1-dev-plus-aosp
am: a638e869f1
* commit 'a638e869f1ec02f4f49e263cefdae99d30e53a86':
Change-Id: I196f70728ccfb0921e8175d1a55362bf261ee8bc
This commit is contained in: