E
Merge remote-tracking branch 'origin/rem_rebased_branch' into rem_rebased_branch

Conflicts:
	res/values/strings.xml