Import translations. DO NOT MERGE am: 7f39ff785e  -s ours am: 7659c56784  -s ours
am: bfe9042d64  -s ours

Change-Id: Id95bf59c810de26ed42d0f7d5663bc31683b0694