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

Change-Id: I7a82eac970307372b737ad4b189c0c1962daa364