[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a78c1443618bdd532ce2b286279a36ebd558fe0
This commit is contained in: