[automerger skipped] Import translations. DO NOT MERGE am: 67e8c15daf -s ours
am: 3f89da2e07 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bb5d74a1aba823d9e8526b55943a08b48d04d9b