[automerger skipped] Import translations. DO NOT MERGE am: 4acf712d63  -s ours
am: 869060e132  -s ours

Change-Id: Id8f198f311c109fa0377819b0bc26ac1863ece9f