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

Change-Id: I8e5cd5cfe8585ed73f74c22af7eea440fe61e2b5