[automerger skipped] Import translations. DO NOT MERGE am: 6097523938 -s ours am: f2a113b987 -s ours
am: ddb79a9a0e -s ours
am skip reason: subject contains skip directive

Change-Id: Ib95527b0c836e060fdc1aefd67d1310c171d4222