[automerger skipped] Import translations. DO NOT MERGE am: 11970dbea9 -s ours
am: 62f4ac3be4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ief98cebda55e0cc22e1f6f7d146cb514e2579111