Merge "Re-enable source re-scan for StreamingSource" into nyc-dev
am: d4c4d2248b

* commit 'd4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9':
  Re-enable source re-scan for StreamingSource

Change-Id: I0c1460ad7178b1b617679108fa156b81003f375b