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

Change-Id: Ide6b017373d8ddf748995c3d5ba1bfee7f0e91b4