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

Change-Id: I2a8b9ee12be1b79e835ea9daa678004ef9a58168