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 am: 251e360
am: f80d64f

* commit 'f80d64f9d1503d12e1d643f39cabbabbd2d74dda':
  Fix overflow in path building

Change-Id: I884bd007e253bafcd1f05df47367e8bf4befd929