[automerger skipped] Import translations. DO NOT MERGE am: 3a1cd52583  -s ours
am: d0cee290fb  -s ours

Change-Id: Ie2e644a6b29284c59586e90eb25e96fe9e42c1c8