Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: bf72a6345d  -s ours
am: 7969b4ff5a  -s ours

Change-Id: Ifda13f2f673b5aed5eb1383cfa88b2cabef5b9f2