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

Change-Id: I1f49daebc5fd03196a0f8f7d0add88d2927fb3ad