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

Change-Id: I045d4f0bb166101d7d236814c67921556a946e9d