Merge "Print the fd that isn't whitelisted." am: cf8db35738
am: 5127a760db

Change-Id: I3504cb8d53c852a46a63a54acba778a8db55f59c