Merge "Check for null owner info" into oc-dev am: f220d95f54
am: d73edd5c0e

Change-Id: Ia4398204190408411d56c564151ca9aafbbc8a25