am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
  Change generated dependency file names