Merge "Color and text changes" into pi-dev
am: 03ddb28cda

Change-Id: I0d66ab47686ef3d63d5a18bef890891a66261203