Merge "Update condition title text color." into pi-dev am: ad031a0a4d
am: 05a0d4f413

Change-Id: I99557205959a219f6d71af946d635aa50e5ee331