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