GF-6936: Second pass at on-device source handling.
Enyo-DCO-1.1-Signed-off-by: Kevin Schaaf <kevin.schaaf@lge.com>