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

Change-Id: Id3affcf44eade46ce3031e8f456a688b456dc4e5