Merge "[automerger skipped] Import translations. DO NOT MERGE am: 6097523938 -s ours am: 7941953127 -s ours
am: 2b284890a3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie5c73a634969fded61adfc3a69dc8f0af0b2f6be