Remove hardcoded quotes on integer

Change-Id: Ifb1e9777fe1338a5b97d061d80355d51d52ea8da
Merge "Remove hardcoded quotes on integer"