Merge "Fix unexpected exception from MediaHTTPService" am: c69ea95fdb
am: 5de0f9902d

Change-Id: I7c9e1c293646e4f6ec134935185953cf93e935f1