am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev

* commit '923ccf247415587a23e7be40eacf4cdb7b4f1503':
  glFinish to flush deletes