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

Change-Id: I8c144db8e7e390ed19ae1d05280323b974b8fb6d