[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours
am skip reason: subject contains skip directive Change-Id: I81bfa960ca27819b2facbb78a1d19fc8ff6e4169
This commit is contained in: