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

Change-Id: I1b1d1cb5d3b685a2a79c3512b59bc5ff6a9d358f