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

* commit 'e552f0a903c0e2de3437320e0fb22e4205ec6146':
  Fix flash of uninitialized surface