* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6': DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6': DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.