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

Change-Id: I6fa57a79d11e9b04ff6dc10d6d335ff56dd1e014