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

Change-Id: Ie44799480418a7280545b0e8b235df381f19ae6b