Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
am: 5d17c4284d

Change-Id: Ibe772dacaafd554b51cc9f5340453244106eefee