Code changes for adding NONE as subcategory

Change-Id: Id2e239056f5be7fd33941fb76e8cfd6a30a2e162
6 files changed