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

Change-Id: I68a4c2c3d3a56712ab8989649ca6cbbeb2712936