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

Change-Id: I0d77edda23d08041d0e043f71d3951717704cc11