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

Change-Id: I8562829647339c35d2b33b6952e2955a878cd4d7