Merge "Restore media.log service" into nyc-dev
am: fc958a0888

* commit 'fc958a0888d47b5d34847afab3b33d877d9ca007':
  Restore media.log service