Fix file print logic bug and update whitelist

Change-Id: I723cb28b05fda314fa42c4d9baf5b2d922446867
Merge "Fix file print logic bug and update whitelist"