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

Change-Id: Ifb3d405407bf829f832bc53ece3ae0fcdf87f479