Merge "Clarify AccountType.resPackageName/summaryResPackageName" into jb-dev