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

Change-Id: Ib4707a5610266cafaeffc7d7b3d30706ca633e24