[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 7b76a0c96c -s ours am: 8b6d44a30f -s ours
am skip reason: subject contains skip directive

Change-Id: I4fd9d32224a49e06c5380993d8d3c2f06e98a08d