Merge "Detach children in transaction." into pi-dev
am: 26aff0d907

Change-Id: If080b08b6e0f159423f5328c2b4df1c4008741f0