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

Change-Id: Ibfc06837aa5c9926546735e93998ad4e75d45cd0