am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev

* commit '8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
  Tighten flags enforcement, API to test Uris.