Merge "ANDROID: xt_quota2: remove trailing junk which might have a digit in it" into kernel.lnx.4.19.r18-rel