Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea
am: 270f217c9f

Change-Id: I918a29fb927ddb578933f64cc989b321e81376e0