Merge "Add last connected device concept" am: bb8b854423
am: 3a3f869e90

Change-Id: Ia75028b244d1ca531826ff37cbe219885bc3f286