Merge "Replace (unsigned) short with (u)int16_t." am: ba028636ba
am: 38ffa670fe

Change-Id: I86b66db777ae23b754476265611fb2f6571f6f35