Merge "jf-common: bye /persdata" into cm-11.0