Merge "Actually print filename." am: 330e7ec836 am: da2025e725
am: 87d0e29337

Change-Id: Ifdbd036a93cde5989ba9fb87f2e087907f3bb27b