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

Change-Id: I4fa68006bf45a0514a153d4373274c12ba10f528