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

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