Update dream config to better match sapphire config

Change-Id: I7dc5d31199ebd077d3bb896ad5c4e51ea018cfab
25 files changed