[automerger skipped] Import translations. DO NOT MERGE
am: 83d678bdc4 -s ours
am skip reason: subject contains skip directive

Change-Id: I273e17ee6cf94e6a6b7a3f6ed2a9b22c5a7a9992