[automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28
am: 5bf6376615  -s ours

Change-Id: Ica580645d38649c5210ddbe0b88bd3516275db13