[automerger skipped] Import translations. DO NOT MERGE am: c297d42ad4 -s ours am: 6cc316020b -s ours am: f17d549aca -s ours
am skip reason: subject contains skip directive

Change-Id: I6db17419d4e9f23d5221d48fcffd6962dab04730