[automerger skipped] Import translations. DO NOT MERGE am: 4b1f78438e  -s ours
am: f4440df532  -s ours

Change-Id: I54d8c247d99c66eefc3d0a4ae3b40455807bd0db