am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev

* commit '14c5da2f86fd8c59f961e6675eeeb4af299a0e18':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix