[automerger skipped] Import translations. DO NOT MERGE am: b2a7d1ff2b -s ours am: 57599e6e6b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe41ed275c8625c42abfb40d91214505282dbc33