Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
am: 0eea3b6c9e

Change-Id: I25c2e6859a5a62997e6e23ffdf7dbd95f0486313