Merge "Disable kBssEntry LoadString sharpening."
am: 6c42676b46

Change-Id: I391437e232503c24c6e610c13131800f65fe026d