Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0ec174802b  -s ours am: a6b312c336  -s ours
am: 17efcd3104  -s ours

Change-Id: If7a37448a1b92b1d8549ebf71e97884c60904472