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

Change-Id: Ic682f24666614f9d683fab5c0206540c224888db