Merge "Import translations. DO NOT MERGE" into mnc-dev am: fa0449aca3  -s ours
am: fa1885a26c  -s ours

Change-Id: I1d35b3e59682539b0a3dab04c6b802498e03662b