Plain Diff
am: 232fa7e0 -s ours * commit '232fa7e0': Import translations. DO NOT MERGE Change-Id: Ifeb5ba644eb22dd6431294f7b31f1c8b38f8a5f3