[automerger skipped] Import translations. DO NOT MERGE am: 757d589afb  -s ours
am: bf7acb5307  -s ours

Change-Id: I3d4085ff8111dfc9bc2edc3ea8ca7925045cbf44