Fix crash when starting the editor

Bug: 7224232

CL 236429 readded offending lines after the merge...

Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
1 file changed