Merge "Prune BugreportManagerTestCases out of general-tests." am: 217ec71c8d am: d49a61b08c am: 2cd0025c74
am: fd8b17e3e6

Change-Id: I1b3f201ba70d4e731634e1b4eab5b1be2b81cbc0