Merge "Delete PatchedObjectsMap" am: 02f6c8d921
am: cbcb7ed6ff

Change-Id: I0c27974b913da25207906b9250eaee81e7717b42