[automerger skipped] Merge "Import translations. DO NOT MERGE" am: d7335dfa3a -s ours am: 9ad11bd4e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I148c4178ec5ef25a747e2b12d18016efe6f85c85