[automerger skipped] Import translations. DO NOT MERGE am: d6a99fad37  -s ours
am: 3cd9c91f6f  -s ours

Change-Id: Ida67076f34384da8924a077674f961e98368ca6a