[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours

am skip reason: subject contains skip directive

Change-Id: Icb31a46077daaff8ac0c0e52e02027be778e9d99