Merge "Remove device whitelisting and hardcoded constants am: 9736d0f3 am: 8ca0af84" into nyc-mr1-dev-plus-aosp am: e908247b * commit 'e908247b': Change-Id: I9d7cf5f9290ee71f5ab07867e62ab4607febf717