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

Change-Id: I0432ee1e5567d40d949c0bc581505c4b81a03196