Easy-to-read filenames in the bundle when debugging.

Change-Id: I093c5bb404d65a083c2f0c804acca36076521546
Merge "Easy-to-read filenames in the bundle when debugging."