[automerger skipped] Import translations. DO NOT MERGE skipped: f874b0912a skipped: 6edf394788
am: e51c2ecbf3  -s ours

Change-Id: Iac07cd6d2f16bd6a92e4967a7321c341e1ccd092