Plain Diff
am: 5b4a55af -s ours * commit '5b4a55af': Import translations. DO NOT MERGE Change-Id: I3a29253a2bbc049a78d48ff7be1c580804bd7bb5