Merge \\\"Fixed an issue where the deleteintent of children wasn\\\'t sent\\\" into nyc-dev am: 1e7d8d3817 am: 86e672c3e4
am: 79536dd212

Change-Id: I0262f5e5d3b6082e7c306a08ec5e6fd184f2745f