Merge "Fix emulation of old platform images."