Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am: 1a1f6b0b1b

Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72