Merge "IDataSource no longer has DrmInitialization" am: 3fd43520ac am: 0666df9fc7
am: 3b3012b6f5

Change-Id: Ic6e6014ccbf43b5fa8aae051f40c2b00b33cc39e