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

Change-Id: Id3c4f39a1984370668f4a5801e04dc8eb1fe7b69