Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867  -s ours
am: d82970fa79  -s ours

Change-Id: Ibb27fcf6ada089b39e24ac0e4224b27df2deafec