Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb13437 am: e38e57c25d am: 43d17a6785
am: d84a546a9d

Change-Id: Ie439eca6ec805e0c60574f21deef1d49574891c8