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