Merge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54
am: 153b83e8da

Change-Id: I813b4b90b3ff65f9f0c9daa61cc3717972968c71