Import translations. DO NOT MERGE am: 6cf2d99816  -s ours
am: cc298f9ae6  -s ours

Change-Id: I28beea32e9cdc8bced4cd2af333e391bfc6d73c0