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

Change-Id: If062334d419839d46d9abd261b7bc5b5df5671b4