Fixes: 120497233 Bug: 111475013 Test: manually flash and check strings Test: make RunSettingsRoboTests -j40 Change-Id: I0a8971226a485f8ec41d83c167e51dac1a9c8107
Test: make RunSettingsRoboTests -j40 Bug: 111475013 Change-Id: Idb6bbfdfe377b61a8fe1f7e81171bbefe23a4ebf