Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: da749ed997
am: 6841ff299c

* commit '6841ff299c9e41285a562266bfe8895ed64de1ac':
  Fix order of operation issue with ResStringPool

Change-Id: I89655a9a2f11fb4a4af73b80857ca7d30c299b54