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

Change-Id: Ia879336fdb95474f85f211515f184d3c8263c22c