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

* commit '6dffeb9eeba785dcf738bfabfec334a6c188d104':
  Add null check to embeddedAllowed check