[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours

am skip reason: subject contains skip directive

Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1