Bug 855792 - CE requirement on maximum volume
fixed conflict in v1.0.1
Merge pull request #9663 from mpizza/fixed_ce_vol_conflict

Bug 855792 - CE requirement on maximum volume, r=alive, a=blocking-b2g:tef+