Merge "Use proper string formatting for the "Active device" string" am: f5848d0f4d am: 8018f82e5a
am: ac8aed2ce8  -s ours

Change-Id: I282150ff2af7dbedd7e0199144ff7a282ffbff5f