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

Change-Id: I474caff2681a34f4b17b83a8981ffecfd363d786