[automerger skipped] Import translations. DO NOT MERGE am: 1f6344b270  -s ours
am: d4ad16c3fb  -s ours

Change-Id: Ic23bcc4cca85307a5f22974afb75236c9e90cc96