am: b6d7c64b * commit 'b6d7c64b': Remove device whitelisting and hardcoded constants Change-Id: I72f49f978e1fe4051d8e5ebb6900dfc0a6a87dd3