Modify last commit to support spaces in filename

Change-Id: I67069a22d1d8871e99bf54a90818ed3645f4a93c