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

Change-Id: I05d2fc14b9f37b6834d844f551376cd696f1f1e0