Merge "Set enum to fixed size type" into oc-mr1-dev
am: a60e6a4548

Change-Id: I08c8cc14f7eb0e5e7e268c7d2f1530e84f20b4ba