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

Change-Id: Ic3f5e71ff435b1dc03e02f7448789e0d4f9538e4