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

Change-Id: I342042c107ea6cf8dcdcefd9d31b53232a8440ff