Import translations. DO NOT MERGE am: f287d7964f  -s ours
am: 306fffd5d4  -s ours

Change-Id: Ia36a6244cecc527e49040e658f3d8789503579fb