[automerger skipped] Import translations. DO NOT MERGE am: 8bf593bd5b  -s ours
am: 3edcf5fc3d  -s ours

Change-Id: Ic735034d7defbe348e0fbfd419f9157c509152f2