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

Change-Id: I39f7918195746ba20404f35621521277310e2c27