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

Change-Id: I93999b1a5d9c7fff6ffd69aa056775d1f356b6c9