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

Change-Id: Iba5be486d0a9952b1062e1cda7a04cc4447a199e