Merge "Check ManagedResource is NonNull before Checking Owner"
am: d1ffb13437

Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec