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

Change-Id: I021d309c9bfc83983a409c40f9a786ae9cfedb3c