Merge "Track change of type from short -> int" am: d854e6e0b4 am: 9881c6f3d7
am: 8a334f433b

Change-Id: Id914c2bd60e6fec47f346684a9c1d8046b5b9b7b