Import translations. DO NOT MERGE am: efa2852fb9  -s ours
am: 61e43780ac  -s ours

Change-Id: I0738565a88a1aa4d61790a1836ebac6379f85e8d