[automerger skipped] Import translations. DO NOT MERGE am: 0517d3d5e5 -s ours
am: 5a98f2fd65 -s ours
am skip reason: subject contains skip directive

Change-Id: I57a2452174078b149c8f4e8c6c98ab551283f3f7