Merge "Remove device whitelisting and hardcoded constants am: 9736d0f3 am: 8ca0af84" into nyc-mr1-dev-plus-aosp