Merge "Always ignore summaries" into pi-dev
am: 1fa5751789

Change-Id: Ic1a0d9c9bf50ea4c250bf4b5736a5da92abf0200