Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2
am: 20bf84e

* commit '20bf84eca094e813fa445b60d22bcf0c27148cd4':
  Fix overflow in path building

Change-Id: Ia4639f0a0dbcb848a6d9c59319c12cd9bd952c8f