am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev

* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
  Private flags are masked in correct variable