Integrate filtering and Export Calendar, minor corrections.

Change-Id: I0d6a7cf6a3bfffe07c5f3253b7caaa87b1902a22
Merge remote-tracking branch 'gerrit/dev' into HEAD
Merge "Merge remote-tracking branch 'gerrit/dev' into HEAD" into dev