Merge "Merge "Add null object checking" into rvc-dev am: bb6f50ce am: df543d2d" into rvc-d1-dev-plus-aosp