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

Change-Id: I7ef3f02d52d77ad75ae1a315f4a5a48737a1da7a