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

Change-Id: I74450c7e5134a71b43842efbb2bc98ec961c4e21