am aa841672: Merge "Support overriding calling package in Documents." into klp-dev

* commit 'aa8416723a19863071d500507943c06bf91483ea':
  Support overriding calling package in Documents.