Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am: e68228fbd9 am: 225bedbc86
am: 5586bc62aa

Change-Id: If01f5067e8f44e35a7b10bbeebfcebd528d09573