DO NOT MERGE Fix calendar availability

Bug: 6933598
Change-Id: Id481982de9bdc07dbc06722b69e788372ebf1c57
2 files changed