am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev

* commit 'e6b4163f38c18072ef89ec593d4647c581dd9a8a':
  Verify inputs to PAC resolving.