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

Change-Id: I21c138c30e4a3fedd9bf987a432813ca89b5c298