Merge \"String tweak \"upgrading\" to \"finishing\".\" into nyc-mr1-dev
am: f6b29b8dd5

Change-Id: Ib134580ca25ac32ba87101353ea09920c195d528