Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7 am: 945228b am: aa7db31 am: cebac70
am: 5e7d964

* commit '5e7d964871fe7217bc9042adc181232a4e3c1f38':
  Fix overflow in path building

Change-Id: I2318464de6db3c058022f042c57840124f72a5e8