AOTP component fixes
@bug W-2037127@
@bug W-2037125@
@rev esalman@
Merging origin/amy/master-pending-aotpCmpFixes into master