[automerger skipped] Import translations. DO NOT MERGE am: a4cac4b609 -s ours
am: 10748d60c0 -s ours
am skip reason: subject contains skip directive

Change-Id: If20464234adda65d202c83c769fcf3eebb6a0b0e