Hoping not to break
--NRLeuenb through EmBoyd
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/model_data.bin
	local.properties