[automerger skipped] Import translations. DO NOT MERGE am: 92214baec2 -s ours am: 4a8558e9d8 -s ours
am: 4c70d5d02d -s ours
am skip reason: subject contains skip directive

Change-Id: Ic69c8b1808ba6956a5ca608fd0d031e098744fa9