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

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