Fix assortment software application issues.

Change-Id: Iaa3c2d4255ce4a540451b042e5297e0537a64a4d