[automerger skipped] Import translations. DO NOT MERGE am: f8db5e31c0 -s ours am: 5c75f61c34 -s ours
am: f668faedbd -s ours
am skip reason: subject contains skip directive

Change-Id: I39f5797aa0526226b37f87fadc6b890a769f4fc7