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

Change-Id: Ie998d47b0d029fe851569e6e99d1d16db3642409