Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d  -s ours am: f642db22e1  -s ours
am: 30490326a6  -s ours

Change-Id: I055b1687c51a7dda29dd25dbce59a1b09454c934