[automerger skipped] Import translations. DO NOT MERGE skipped: aa2d5f7f4c skipped: 693a6388cf am: b291bb2f1f  -s ours am: 00a36cf0ac  -s ours am: 64fe4bce78  -s ours am: 0b05112b25  -s ours
am: 038784c8f5  -s ours

Change-Id: Ie6ad3cc2534af392c67422db71f58256934eaa1d