am f5fd08d6: am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1

* commit 'f5fd08d64959f23ba87f4da4771ca511b05a6be0':
  Fix issue #5433192 and maybe #5433192
tree: c908dc021a1ae92fc6402bf7d21813c1938411cd
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE