Merge remote-tracking branch 'mokee/jb-mr-2_mkt' into HEAD

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

Change-Id: I3b4c93be046d2b7e38b58d3633bf2702de63236d