[automerger skipped] Import translations. DO NOT MERGE am: f896493c70  -s ours
am: 8744027668  -s ours

Change-Id: Ic42f563ca5bf56c2b35a3a90c27fbaa2ed7c32b7