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

Change-Id: I779a14bfe91ffcaafc39cf5ccdc7c95c462c960b