Merge "Replace short with int16_t." am: 34affaed9c
am: 62d118a444

Change-Id: I888f0ea075e941da3498dad724fb518a9e2cd355