am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."

* commit 'df8d0ffd73f8359def90d2f79d25059023018213':
  Label existing /data/mediadrm files.