Merge "Add last connected device concept"
am: b035c08109

Change-Id: I4201e66d6ca03b46c254f42b616054bd18fd1432