Store authority with indexables so that indexables could be mapped to non-indexable keys

Test: manual
Bug: 113949972
Change-Id: Ia3863b1c45694127a1651e6c27326a47b9043bdd
7 files changed