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

* commit '66ee877f5d27b4dd4081702ad216359971e1b8b3':
  Tighten flags enforcement, API to test Uris.