Merge "Add placeholder properties for emulator"