Merge "Import translations. DO NOT MERGE" into mnc-dev am: a464ecf3ec  -s ours am: 4e75ddf7f3  -s ours
am: fa4f307821  -s ours

Change-Id: I18c2120865b602c157cc1ff673f097ad773641c7