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

Change-Id: I2aab3b70b8d28b41b609d00b31b852c0ae26a869