am e2631032: Merge "Fix UnimplementedEntryPoint initialziation."

* commit 'e26310320e7ee7bdfcdf340d2e66f216f1d90aa6':
  Fix UnimplementedEntryPoint initialziation.