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

Change-Id: Ib8d59b95257b5af3163393e8331cedce5e756e29