am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests
tree: 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE