Make magic numbers unmagical

Still some left. Need more careful handling.

Bug: 63742
Change-Id: I8f31ddcc4248f1f938fc1bd1c4c048ca5532de08
Merge "Make magic numbers unmagical"