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

Change-Id: Ib055e38af375767cc1399a0270fe03937dccbff1