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

Change-Id: I9ecdf85922fd8102cfd03589b0ee3656eb5bc708