Merge "keymaster: Remove usage of PAGE_SIZE" into main