am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source