am 270a609e: Merge "Add telephony intermediates to classpath"

* commit '270a609e4088978f83191d29311e83e496e34b5b':
  Add telephony intermediates to classpath