fix #1388277 (optimizer core)

Change-Id: I24a662c86e93451afc514c24210d415811369773