[fixed] Junk Dealer in Kaadara

Change-Id: Ic9f96498922a3fb13ca8411cfbea6170ee69e3e5
Merge "[fixed] Junk Dealer in Kaadara" into unstable