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

* commit 'a154d76ed42a8156cf7c4e4a2c3342fb26c3819d':
  glFinish to flush deletes