Import translations. DO NOT MERGE am: 9354ca48fb  -s ours
am: 4a32ddb33f  -s ours

Change-Id: I3dceb58c3cdfb458170b017cbd6452e72a18c087