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

Change-Id: I84fca3d2ea23e15ec9c8d4ddc4003490ccfe508f