[automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button."
am: da38b41b9a  -s ours

Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d