Merge "Change cross profile calendar API used in robolectric test."