Updated to use the constants from AndroidUtils