[automerger skipped] Import translations. DO NOT MERGE am: 86643701e5 -s ours

am skip reason: subject contains skip directive

Change-Id: Idcc7b6e0ba33b6415b0aa1b6492e5eaf18d32477