Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev
am: c399e4d964

Change-Id: I9658d27ee9a694c580204f0e041991d754f93130