Import translations. DO NOT MERGE am: 433cb3227c  -s ours am: de8c1dfbad  -s ours
am: 6e8333bf05  -s ours

Change-Id: Id63bb127d3118984e39ac1741a79dd43f65143d1