Merge "ART: Remove Security initialization cutout" into nyc-dev