coverity#705359 Mixing enum types

and

coverity#705361 Mixing enum types
coverity#705362 Mixing enum types

Change-Id: I557d7178277e5d497e3bbab12b75724c05653f57
coverity#705381 Mixing enum types

Change-Id: I1dad21f91f5195585ca9125b7f8f47c7bd5a1a76