Merge "Merge "Correct lastId on onCreate with unexpected state" into oc-dev am: aed0c10d52 am: d1942b3abe" into oc-dr1-dev-plus-aosp
am: 7a6f11d210

Change-Id: Ie54f1e7712c199b047d95fe28d4b89c01c0f9f73