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

* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
  Switch to use SF cached source