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

Change-Id: I3863a5d9625364e84531f2eac339413eee2d7cb4