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

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

Change-Id: Ia6b269dba2d0b5f89323d49e73a0b85c8a32742f