Merge "Correcting color for Toolbar; reverting partially of ag/1585189." into nyc-andromeda-dev
am: 14ae4027ed

Change-Id: I95f3d98b62f344377a0bcb3168cbe4120ab70347