Merge "Always reapply strings. am: 9c0c3d8d8b am: 630cc3017a" into nyc-mr1-dev-plus-aosp