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

Change-Id: I0ef39f714a837fc5c7bd3595df247d4d126afd6b