Merge "OPP: Fix support for vCal 1.0 and iCal 2.0" am: d072aecef9 am: 0cb1ceceb0
am: 62c7e9d633

Change-Id: I6fa0ca759649201716a06aba77519ca0680bf439