am 6fcaf93f: am 40d2705e: am a154d76e: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev

* commit '6fcaf93f3ad73780bfe4392cd4d60e05cb463b8a':
  glFinish to flush deletes