[automerger skipped] Import translations. DO NOT MERGE am: 07e7aae097 -s ours

am skip reason: subject contains skip directive

Change-Id: I217766c374b7bd36adfc9bed49678d68a95ea59c