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

Change-Id: If3ddf8d0010f763476d69dd78d4409a5b9998758