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

Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6