Merge "Move most mirror:: args to ObjPtr"
am: 38a4223fcc

Change-Id: I8a337ee83be0e24ed224dee216633142642cf1f9