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

Change-Id: I59a8143162800f35748b1e145973743855faca09