[automerger skipped] Import translations. DO NOT MERGE
am: 11ebb14241  -s ours

Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606