Merge "Resolves some lint errors"