[automerger skipped] Import translations. DO NOT MERGE am: c9dd883594 -s ours
am: 8fc8cd38fa -s ours
am skip reason: subject contains skip directive

Change-Id: If265ff45d98ec28ba4687c25ed10659eeaa99ff2