am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."

* commit 'bd5f10addfba8df40c8293d95c002044acbfa526':
  init: do expand_props before calling the builtins.