Add more variants

(cherry picked from commit f5cc2544f6a30eb190afffb5ef6a2dc64d8f8dd3)
Remove test changes

Last changes in system.prop were test only.  Don't put here.
(cherry picked from commit 3fb8374f4d1b68f13024ee1f7f978efc7f3920c6)
Add another variant, fix another

(cherry picked from commit db3862016d5fe7fdd35409305f3c31ac065b7e08)