Initial bring up for L

Conflicts:
	system.prop