am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '60e293cfed07ef32c16262435dc3d9092a7fb572':
  Fix flash of uninitialized surface