Merge "Correct lastId on onCreate with unexpected state" into oc-dev am: aed0c10d52
am: d1942b3abe

Change-Id: Icc42f18a220848b58cbe0035e726fdbb53df58e0