Amend: Fixed working directory issue Amend: Added comments and encoded '%' character as well as '/' Change-Id: I5297d35e1cbc33ee8d2af24da02b101bb6b766ba Former-commit-id: c3a682e2885c81248fa0aa3f11d82f1d34ff74f7