Import translations. DO NOT MERGE am: 16891d4831  -s ours
am: da5e54048d  -s ours

Change-Id: Ia75acde5e26cc4c597079397d77f03fc74c077c9