am 1547467e: am 64a85856: am e022706b: am 3c307955: am dab4af47: am 7e2ed3b9: am d20bee71: am 1d4a07f6: Merge "Re-call getBuffer after writing in bigram/shortcut policy."

* commit '1547467e':