Import translations. DO NOT MERGE am: ff30bb073a  -s ours
am: 7352c5e613  -s ours

Change-Id: I84b504345814c3ec4fcf9c1538a834c652ff3547