Merge "Set bolt and plus colors together" into oc-dr1-dev
am: c86a5dbee4

Change-Id: I16ac7e9a14a00573beef6db44390720b3bf5530d