[automerger skipped] Import translations. DO NOT MERGE
am: 01379e6414 -s ours
am skip reason: subject contains skip directive

Change-Id: Id937ba87922702ea774f8a76575a543b95eaf56e