Merge "Keystore 2.0: Revisite Authorization.java"