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

Change-Id: Ifd40caff731d7a37a02a4335a23c0a74fa68253e