Follow-up to e6215c0e. Those should have been uint16_t. Change-Id: I2cc13701eb937dad488bcf405a9a7b26eabb656e