Merge "GenericSource should report -1 instead of 0 for unknown duration" into mnc-dev