Make sure to always pass constant to as format

Change-Id: If4ba2140f4e5929aabe8d7c69aadbf320bd3ac54
Signed-off-by: Saggi Mizrahi <ficoos@gmail.com>