Merge "Unstub PrivilegedActionException" into nyc-mr1-dev