[automerger skipped] Import translations. DO NOT MERGE am: b24da2ee82  -s ours
am: c5f8d911a2  -s ours

Change-Id: If9692f8c1d75ba4a6f66b334ad51e072f045ca76