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

Change-Id: Ic38a75494dee8472ea83a910978b0a14cc94e701