Merge "Improve dotdot workaround when src begins with '/'" am: 7918e5121a
am: 05b0da9441

Change-Id: Iefac888b97477ce1a5479a5a931108dcfe229aa3