Build fix. Additional conversions of subId from Long to Integer.

Change-Id: I7e59e853c7d7ea7f935629fc8d97e49b1cfffdfd
1 file changed