Merge "Various lint error fixes." into ub-launcher3-burnaby