Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456f4

Change-Id: I40cdb43db6f6f6ed3400ebfcbc48a0402850a3f5