[automerger skipped] Import translations. DO NOT MERGE
am: 3e19c37033  -s ours

Change-Id: Idf36f5a4f589797c960072dc4fff9eb1ccae2574