Import translations. DO NOT MERGE
am: d0bc779893  -s ours

Change-Id: I06ce169e1bebd7c4543090b2ba0c3b119121d954