Import translations. DO NOT MERGE am: f05bf692cd  -s ours
am: a994c42cda  -s ours

Change-Id: Iedb22355cb316484c2b324aef774f562df2ac37d