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

Change-Id: I97f1cda1efc1fb7d699b34ab725a205d3143bdad