Import translations. DO NOT MERGE am: 5803ebaf43  -s ours
am: 984b7e067b  -s ours

Change-Id: Iddd0bb790f7e1f7af8397acc4a42ede5a813f02c