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

Change-Id: If4e17a0d64aa135006e2ba4a21f00cdc98896d21