Merge "Fix unexpected exception from MediaHTTPService"
am: c69ea95fdb

Change-Id: I0861c8678febc06a66cb0074e5b85a6d7c73f60a