Merge "Fix order of operation issue with ResStringPool" into nyc-dev