Import translations. DO NOT MERGE am: c92d371104  -s ours
am: c2b38be10f  -s ours

Change-Id: I259a242b5481025eb5eaaaffc56a9c22f5cdc424