am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner