am 28429d60: Merge "Fix emulation of old platform images."

* commit '28429d6055d560b9de047f6b6be278518acdafd0':
  Fix emulation of old platform images.