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

Change-Id: I0d165abd3a0f514737a814c06adbd91e3e960a41