Make the $/# in front of constants optional am: d5ec2a1321 am: a86735a62b
am: e56adc3477

Change-Id: I23eca09d56dffbc987597aaaf7b60a4d9ac78a4c