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

* commit '160c18a4d209f56766fdd90e4711c8e29fd407e6':
  Need a public way to wait for cookie operations.