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

Change-Id: I91f2801c18fdd946b357d81c8961bac21b28c972