[automerger skipped] Import translations. DO NOT MERGE am: 250b9e7012 -s ours am: 90cb40e80c -s ours
am skip reason: subject contains skip directive

Change-Id: I0c32b44c220d21e85ab1cc26b467defc9e56beec