[fix] mask scent and camo kits

Change-Id: I68699a97585a606d98c0370b2916e4b284c08465
Merge "[fix] mask scent and camo kits" into unstable