am 1bf37957: am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev

* commit '1bf3795798aa462187a8c83220f900f293dfc1ee':
  Allow "opaque" flag to be updated. DO NOT MERGE