Adding granularity states for barbican upgrade

Change-Id: Ic3ef10aa4459282286ad0de0f11d0a90c8e6ea2d
Related-Prod: PROD-21934
15 files changed