Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 68203dee07  -s ours
am: 0a8d8def4d  -s ours

Change-Id: I93bee558d29b6bb20ade1fa09c0ad6fb742653fd