Add support from makecat.py

Change-Id: I7383dfc977e5fef7278262c98f28baae02420cce