[automerger skipped] Import translations. DO NOT MERGE am: 5fb4e11c76 -s ours am: f806b40ab8 -s ours

am skip reason: subject contains skip directive

Change-Id: Iaf1680572fd34e69f7a7fb5bbeb2c37ca3a45399