Merge "Updates colors to match for when peek works. am: 25023167 am: a0ac7818 am: 6aa54282 am: f4044705 am: 01af326b am: e7778044" into nyc-mr1-dev-plus-aosp