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

Change-Id: Id1dbebf92d19070a4e9097d19254ca5a1e79542c