Merge "Move system default values in system partition"
am: 7c61a4eaef

Change-Id: I42cf2aecb3d2d1be25f58d91925fcfe3ee7e4558