Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am: 4837ce8ca6
am: 320d126394

Change-Id: I637c546da197a7d9cc6b1ea91dc6f45f51f7ecda