Merge "Import translations. DO NOT MERGE" into arc-apps
am: ecd52794ee  -s ours

Change-Id: Id50b4e785d2a3e6cad08d2f2b00654b965ecc743