[automerger skipped] DO NOT MERGE Don't crash if already unregistered am: 07c129cb1a am: 002f775293 am: bdd10cc8ee am: 81dfd186ff -s ours

am skip reason: subject contains skip directive

Change-Id: Ia2f90103d5fe02909c8923caeea165b5884df9c8