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

Change-Id: I7b9eee4064112569c2dead6bc10d232d2b4cc118