Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev

* changes:
  Build: Add option to restrict sanitization by owner
  Build: Add option to restrict sanitization by architecture