Merge "Correct xtquota value checking mechanism of binder test"