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

Change-Id: I0bc92070dc5fd2661967265b17f41456f5556213