[automerger skipped] Import translations. DO NOT MERGE am: 3c66f7a0f9 -s ours am: 5e203e7a44 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee697e3d530b824d97761d3fe7b3dcf2c53a1d55