Merge "Change action bar icon and text color from white to grey" am: 8e333d9051 am: f6e07babb7
am: 40fc0e1b04

Change-Id: Icf318e4e6e63f129195b749f49e78eb59499460e