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

Change-Id: I02c5c7360356f7aa5bcb5309bc2d7d85640aee2d