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

* commit '467b30bb2bb1a2333835dd39b78fcd4b2f240ae6':
  Support overriding calling package in Documents.