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

Change-Id: I1737c584ac737de526bcdcca46da7ed30fcc7a68