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

Change-Id: Id3951730e9a54ef23cdaf8036f80d86f6e30c693