Merge "Merge "Re-enable source re-scan for StreamingSource" into nyc-dev am: d4c4d2248b am: 76c12009f5" into nyc-mr1-dev-plus-aosp
am: d74fecdbce

* commit 'd74fecdbce8de4d52a67c0f2507dc12253f7a45b':

Change-Id: Ie261ccf16fbb0550ba0ad547cf4d096630acb12d