Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 0630d92064

Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa