Merge "Add null object checking" into rvc-dev am: bb6f50ce am: 046a03e5 am: 1eead951 am: fb08f293 Change-Id: I7d271be3a3828eabaaee54159f789d70447ed17a