Merge "ResStringPool: Fix security vulnerability" into pi-dev