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

Change-Id: I6ebc14c249ca0cc77783c63c0acf9a1738349010