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

Change-Id: Ia357db1288f3ad1b2537c9ae28ee03dc200657da