cxserver: lint fixes

Change-Id: I8d2eb3996ff0b4b91a92478d74b48002be0ee090
Merge "cxserver: lint fixes" into production