Merge "Enforce background fallback to be non-translucent" into nyc-dev am:...
Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f6 am: 49452931
am: 09c17150
* commit '09c17150':
Don't bother with WeakHashMap for direct alarm bookkeeping
Change-Id: I77e998c444e5cd92422b9e176f5c9aea8526e6ce