Merge "Throw security exception for non-parent aware APIs" into nyc-dev