am 49c78f75: (-s ours) am 30d8517a: am f8d6e7cb: am 32720197: am 57198e18: DO NOT MERGE Fix NPE in RegisteredAidCache

* commit '49c78f75ecdce89e16119faacea9c62fcfc3a283':
  DO NOT MERGE Fix NPE in RegisteredAidCache