[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817  -s ours
am: 60682c726c  -s ours

Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f