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

Change-Id: I54f63c248f5ee934989484febe2d1a31a733cf1f