am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev

* commit '8890013ae0473663a6b9591db6230e9038ba6711':
  Add null check to embeddedAllowed check