[automerger skipped] Import translations. DO NOT MERGE am: cf77f41cec -s ours am: 6924739d94 -s ours

am skip reason: subject contains skip directive

Change-Id: I07aad4b4debd8c4b0d092762248fa1da54f15df6