Merge "Add checks for Event validity before commit" into froyo