Import translations. DO NOT MERGE
am: cdd4f84e06  -s ours

Change-Id: I6e14618caf9ce565b28148fe75827416fc1894cc