Merge "Remove unnecessary parent restriction check" into rvc-dev am: 37fc495766 am: 4ce733af3b

Change-Id: I7a6b0cf7bcf5a4893d7860c1d8dcaf87fcc2598d