This helps compilers(gcc/clang) to use smaller integer types. Change-Id: I5ee6bda0a76468daca916c8b9120d9e7e78ade8e