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

Change-Id: I5d66dc9cf67c898b116aaf78a5678c44be5d147a