Merge "Wire up zram setting, system property"