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

Change-Id: I1bae9a6270fbc8c40095e6278dd87b6ce6beafd2