Merge "Delete PatchedObjectsMap"
am: 02f6c8d921

Change-Id: If88ba6733ddf6b192913ce92b0e338afce184d01