[automerger skipped] Import translations. DO NOT MERGE am: 2b3342d3ef -s ours
am: 4d36767b6d -s ours
am skip reason: subject contains skip directive

Change-Id: Icfb0ba87e7deca61e00aa5f159c1c01258d6c1e3