Merge "DO NOT MERGE fix ratratchet when CID change right before RAT change."...
Merge "DO NOT MERGE fix ratratchet when CID change right before RAT change." into pi-dev am: cd8dfe2d -s ours
am: 4624f616 -s ours
Change-Id: Ic2ec0e180bedef426bc219f020c0ebe836f4d75d