Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f13c6c2a4c  -s ours
am: 4fd00b9756  -s ours

Change-Id: Ia7246f6e66ba1e7931aa7dd88f65408e9c3973f8