Merge "Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping"...
Merge "Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev am: cd0aa9cd am: 7d45e023" into nyc-mr1-dev-plus-aosp
am: 8b41b751
* commit '8b41b751':
Change-Id: Ieddbdbea25f365cd0e81cd1ff52d016013e6ddb6