[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 am: fa863f597e  -s ours am: 3d82e195f7  -s ours
am: 0f9e3adcda  -s ours

Change-Id: I6adf3f79ffb510e4770e9e39dcb1b5fd55d304f3