am 01b7a98c: am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb

* commit '01b7a98c31f3d4587fb6739c8c6b35530177c20c':
  Need a public way to wait for cookie operations.