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