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

Change-Id: Iae8f67a95e708d53a57c0e5f443c7387670e5721