[automerger skipped] Import translations. DO NOT MERGE am: a1ad7d73d4  -s ours
am: 7c526c0d76  -s ours

Change-Id: If2c5677d9507803f2885b9d3b87f7a6d1147e507