Import translations. DO NOT MERGE am: b004945727  -s ours
am: f1a5ffbf99  -s ours

Change-Id: Ia88146fcb745621d2af59dd81817beb9d7f3e9a2