Merge changes I31a146f8,Iac599448,I5b1fd9e5

* changes:
  Remove support for ICS and non-PIE.
  Fix python test regressions.
  Improve error messages for using removed things.