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

Change-Id: I07f15d7dc2b8cbcbe4af8f9ee6d9af845f284517