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

Change-Id: I60d5faf37fdc451e6c75d61802617885f8f34a03