[automerger skipped] Import translations. DO NOT MERGE am: 6b16bed46b  -s ours am: 4fe22dec49  -s ours
am: 2f9282d478  -s ours

Change-Id: Ifba7a3e513378921bdc7d19e57ee794a3f407acf