Merge "Revert "Disable kBssEntry LoadString sharpening.""
am: 11e7f99419

Change-Id: I7d92a42713d31c470e969cfef24274164521a2f7