Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fcec79296d  -s ours am: 0f61118df4  -s ours
am: 745397ac47  -s ours

Change-Id: I15ef8775b17edb4d42afae676a84939ddf1f8e3f