[automerger skipped] DO NOT MERGE Fix summary text for advanced button. am: 20e7c9d0ba  -s ours
am: ca9617ac6b  -s ours

Change-Id: I163ccd679b9321013ec064172442146e732d8e3e