Merge "Warn about sensitive bugreport contents." am: 702587e787
am: f0f9fab3c8

Change-Id: I57e9d3698fc6e16256ef46f73e20dc8729db5358