[automerger skipped] Import translations. DO NOT MERGE am: 5d216c7e57  -s ours
am: ef1f876f37  -s ours

Change-Id: Ifb98c7149241d7217cdf6e3b629276c30a076498