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

Change-Id: Ib8fe4bce8b10dde72885f8e5a04e0953eb258015