Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb134 am: e38e57c2 am: 43d17a67 am: d84a546a Change-Id: Ie439eca6ec805e0c60574f21deef1d49574891c8