d2: fix world mode chioces

Change-Id: Ib16e47ac3658a1e19e520bbb456dcd6c279f49b4
Merge "d2: fix world mode chioces" into jb4.2