am bcbf9ae4: am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit 'bcbf9ae4de41b2cd98ef96f61066496030ef31a1':
  Fix extra/missing : in path setup.