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

Change-Id: I69e55b862242a42054c87477cbbc2723fa1e76a4