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

Change-Id: I16bf32e2bcdfd6ac04c19c0112f8c2ce56bd0271