Merge "hiddenapi: Refactor before new features are added"