Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev...
Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a am: 19ad9f3f" into nyc-mr1-dev-plus-aosp
am: 881daf45
* commit '881daf45':
Change-Id: I7c376b929487439ffa3e0a693e001c079cfba134