Merge "Merge "Use colorAccent for profile_button." into nyc-mr1-dev am: f679329412 am: 099d69999f" into nyc-mr1-dev-plus-aosp
am: 58db3272a4

Change-Id: Ia92cb8901eaa723bff58ab0c6e1351d98a8d754c