am: a68d1f10 -s ours * commit 'a68d1f10': Import translations. DO NOT MERGE Change-Id: I99d55bcb79d0e4e066eb558f887688ea7742eb36