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

Change-Id: Ifa305e87acbc3b03931925b1893d413e5d82e51a