Merge "Soanr fix: AbsCredBody.java"