Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c3ba50cc48  -s ours
am: f9bdf27124  -s ours

Change-Id: I1face0bfe1f87a4f8467784b082cf47a01c9d1b6