dff92fe1aa
Conflicts: res/values-be/strings.xml res/values-et/strings.xml res/values-ms/strings.xml Bug: 64937210 Test: flashed img Change-Id: I28557d652cc5a547f8b94a60a41f381a5af2fa84