am b9466db4: Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev

* commit 'b9466db4a56564101a26865962dda87aaeab56ff':
  Finish issue #10779747: Calendar Storage crash observed...