Merge "Cleanup of Calendar.java to prep for api"