Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c0e7b25f08  -s ours
am: 86141467a3  -s ours

Change-Id: I6eec541005b9717cb6b79b6eb3acc42ea86a7b65