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