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

Change-Id: Iaf45640db64c8edea509c1f4550595b8284ef08c