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

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