Fixes node addition flow

Closes-Bug:#1319838

Change-Id: Ia387ada8ad26be083fdd11d33921ed43a808a321
Merge "Fixes node addition flow"