Clean up hidden constants
am: be4fe78e0a

Change-Id: I03105629b8c933fe00b91549a0e46c796f7be5e8