Merge "Merge "Correct lastId on onCreate with unexpected state" into oc-dev am: aed0c10d am: d1942b3a" into oc-dr1-dev-plus-aosp