Merge "Avoid adding node itself as child node." am: e0a34bf17f
am: 234076ca37

Change-Id: I6f395d4c831a0a7ef60c7704461a071a9ce404f6