Remove one hard-coded constant

Change-Id: Iea8f8fb9c9ec2f2bf41879edaead36deb460e0ff
Merge "Remove one hard-coded constant"