Merge "IDataSource no longer has DrmInitialization"
am: 3fd43520ac

Change-Id: I27f64d73a04448521ee0becd705f355d0efb3a6a