Merge "Remove extraneous /" am: 8db170d
am: cb25924

* commit 'cb259241a269d54a9c2a2644cb3c79ce2d307403':
  Remove extraneous /

Change-Id: If026bd7a46bf08a403277cb64e8e1ea4160a20e8