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

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

Change-Id: Iaf9dd5bca586052d2f47dca564485b076831bb59
fix merge

Change-Id: I339fbe9ae8ae89900d8843f801051574bbab22ae