Bug: 36070413 Test: make -j100, updated string appears in Settings Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3