[automerger skipped] Import translations. DO NOT MERGE am: 65d2da7213 -s ours am: d5d6a49ce8 -s ours
am: 3978e487dc -s ours
am skip reason: subject contains skip directive

Change-Id: I44b94b1a3ebfc701ef2949bc480256864eea3a41