Merge "Remove lite optimization from protos"