Merge "Use proper string formatting for the "Active device" string"
am: 1b5703f9e9

Change-Id: I53fcb586273b02339e83f2514274e3be662b67ba