Merge "Clean up mirror/object"
am: 15bdbf1e18

Change-Id: Ie40141fd7e9733fb26689fb309f0c38ed7e86878