Merge "Use Calendar.Builder for MAP Client timestamp parsing" am: b12974bd3d
am: 28d669d049

Change-Id: Id8f541eba188c83675387945704b1aced65bbe8c