Merge "media: Properly calculate percentage tolerance" into mnc-dev