[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 805865c314 -s ours
am skip reason: subject contains skip directive

Change-Id: I01982de063bc8532fe9615ba0a451527aafea132