Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 3078e76284
am: 36045d1e9c
Change-Id: I69495733570bf87c679265102ed91c986abeb922
This commit is contained in: