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

Change-Id: I3b434c5f6ad560719798c4d0c1fa5d4ec6eaae00