Merge "Use month in the range 1-12 for 3GPP2 SMS Time Stamp instead" am: 223696559f am: fe80efe1d1 am: 163015b675

Change-Id: I8d1844e8cc707fc40e008c0c3540709ada31d875