Undo change of variable name to string
am: f049b7f4f1

Change-Id: I801478ee20bf34f9255972004da3e42fe3df6038