Import translations. DO NOT MERGE am: c78569cc23  -s ours
am: 6e307f0cd8  -s ours

Change-Id: I8ada86da67601caa6bf6ef2b6ae7a31eed1ff8e8