Import translations. DO NOT MERGE am: 84cd5cbca0  -s ours
am: 5eba8f8978  -s ours

Change-Id: I4fc286b2adfdf79b5f13bf4c318ad0d895e0ee6f