This will ultimately replace the whitelist resource, but this change doesn't delete it to avoid removing the functionality temporarily. Bug: 6906525 Change-Id: I576edc42cd2a964b86b7597f1ede1cf6ec8e26c3