Import translations. DO NOT MERGE am: 6173d397d2  -s ours
am: 668a1829df  -s ours

Change-Id: I1f1dcf22e8f580fa42588fc4bed5be37bade8ddf