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

Change-Id: I2b9ce480ada705dafe132ddfd993bfdcc73c8664