Merge "Import translations. DO NOT MERGE am: b4f16b10 -s ours am: e7527d13 -s ours" into oc-mr1-dev-plus-aosp am: 16bead77 -s ours Change-Id: I54b6025846fa5f52d3a321da165ca7685c147526