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

Change-Id: I02fde80e93f703a3c8b44c776dd0673fc0a2a264