am: 9736d0f3 * commit '9736d0f3': Remove device whitelisting and hardcoded constants Change-Id: I339470ddcc8c0ea9f9594f2324cbc195a8215912