Merge "Add last connected device concept" am: b035c08109 am: 6d640090cf
am: 631d838440

Change-Id: I1cea9570705b61b4c2495ef58e6d54192a28243d