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

Change-Id: Iba88fca3f73e7b5855b5d5ad97a2ae7fb47387c1