am: e393f57d -s ours * commit 'e393f57d': [NAN] Replace session callback configuration control [DO NOT MERGE]