merge changes from Omni 4.4 into local branch

Conflicts:
	res/values/custom_strings.xml

Change-Id: I0dd5c924ed883d24fda5195df5efb605af114faa