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

* commit '40d2705e4d7eb06d92fbcc5fdc75841a41dcbb71':
  glFinish to flush deletes