Merge "Add last connected device concept"
am: bb8b854423

Change-Id: I3487cf8182f4ced0938b022c0b8b1c0d53099fdb