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

Change-Id: I3b1bc8ad038e92c2fec7029f2ecc526629424ae2