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

Change-Id: I0cd9a23fc9d8dc550921d4406e77485dd5a56582