Merge "remove unused resource patchset2. remove dependency" into 2.0_beta