[automerger skipped] Import translations. DO NOT MERGE am: 59b9b3af0b -s ours am: 2557c8ec83 -s ours
am: 5a21c3ab3d -s ours
am skip reason: subject contains skip directive

Change-Id: I4ed44c9184378691b697e5f24d171b3d23ea3ae1