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