am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1

* commit '9edb26ea551bec24fa417a854ecec3801f15dc1d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
tree: 76a85ebc08e2538fb6a27cea972455efcc38a856
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE