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

Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984