Merge "Make toInt() a little bit shorter by moving std::underlying_type to a template argument" into pi-dev am: fc40e7d7f9
am: a95c0dd634

Change-Id: Ib140fed9c5e4bf1b262ebce28975a5bbc2c995c0