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