[automerger skipped] Import translations. DO NOT MERGE
am: fa6c3d88ed  -s ours

Change-Id: I2c15dd32385419cc00539e06b3d00ea4ead39291