Merge "Merge "Fixed a bug where the summary could become visible even if it...
Merge "Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am: e68228fb am: 225bedbc" into nyc-mr1-dev-plus-aosp
am: 816cc359
Change-Id: Ia4ef27ae0eb496653a3b515c5cbb10f02b67c63f