DO NOT MERGE Change batch finalization timeout mechanism from...
DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm am: 1710e5f0
am: 6bf0344e -s ours
Change-Id: I36505cd9cd17d1f4c540a39fc0c115c5470d52d0