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

Change-Id: I5eb69f5179f420f1ab678a025ab7bf28f93f595a