[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 673c0661db  -s ours am: 347a9297cb  -s ours
am: 345068b121  -s ours

Change-Id: I7fc8674859d3ae6df1a77319c07268fa01e8137f