Merge "Set autobundled summary color. am: 3011fd4dbd am: d31e42a52f" into nyc-mr1-dev-plus-aosp