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

Change-Id: Ib39e8d6e53e194fb625539b61dfd4df5440cc1c2