De-Hardcode strings and push to 1.0.1

Patch-set 2: Fixing the rest of the hardcoded strings
Patch-set 3: TABS :(
Patch-set 4: Missed a couple of strings

Change-Id: Iede6552ae5416fc844d39b1b7ce7a9cf15b15879