ending slash comes and goes depending on the container.

Change-Id: Ibeaeead7dbd97ae12379a2526e38d1e3b2e6aa48