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

Change-Id: Ic1ea6c7876976fb053ee41417e438355d5834b9d