Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e97 am: f0e13afd7f am: b4e110ec48
am: 8433325fba

Change-Id: I956d1f67c5a31886df206b6f64943e5f8073157c