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

Change-Id: I56086c2d9fd23497151f919417cb8feaab056c10