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

Change-Id: Ie492f6bbc4342819c4159b30a2027ef851e04038