[automerger skipped] Import translations. DO NOT MERGE am: ed032f3403 -s ours am: 02ec597fab -s ours
am: a327cfd887 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic40e66ee70996621f1b44030881c9266f7d763e8