Merge remote-tracking branch 'mokee/jb-mr2_mkt' into HEAD

Conflicts:
	core/res/res/values/public.xml

Change-Id: I94c0a49b8f7967ad08ae9450db0a770d5b12d2ef