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