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

Change-Id: Id2e1cb5e4e4d11299194ee36e6faeca670b8516a