[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours am: 06ad738ac3 -s ours
am: 3f519896d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I80dc6322d1e89f9b66960e7635d78103fd6fcdb0