Merge "Remove 2G lock for O2 devices." into klp-dev