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

Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81