Merge change I80332800 into eclair

* changes:
  Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE