Import translations. DO NOT MERGE
am: 3beb113d7c  -s ours

Change-Id: Id3bfdb57096b9d71c0ab03873ba632dbe8a4b510