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

Change-Id: I2aa30b88211dc6211db8494cbb249930b2c48790