[automerger skipped] Import translations. DO NOT MERGE am: fc7f1bb0ea -s ours am: 39b5384782 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic4b7e86aca12c585cd4f4897e4259f82c829cb79