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

Change-Id: Id8bf35dfc47f3016509a5fd1f0896e9f4eef65ce