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

Change-Id: Ie29b906d4592b613dc91f3ad858e543ff8e5f7a2