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

Change-Id: I4a76d2e379edd8e1b177f8c260378bd4facf81f5