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

Change-Id: Ic864ee46fe664765413de84b5da61d21995b9440