Merge "Track change of type from short -> int"
am: d854e6e0b4

Change-Id: Ia5f6c78811911cbf211cd8f716bd6a3c2a6d8a69