Merge "DO NOT MERGE Change batch finalization timeout mechanism from...
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev am: c399e4d9
am: 666e59f9 -s ours
Change-Id: Ie934c7a6e884eb13a23a620c43bab68b989cb454