am 515a94b2: merge from open-source master

Merge commit '515a94b25aece44c87c4f8ee48bea82690a2ba57'

* commit '515a94b25aece44c87c4f8ee48bea82690a2ba57':
  Tweaks to sample .classpath to reduce errors.