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

Change-Id: I258f9f0a923a98d2fa32cae578d637124c8f0901