[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d
am: 81a6ef98f3  -s ours

Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89