Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0a366715cd  -s ours
am: 93774e5a5e  -s ours

Change-Id: Ided9230e788076bbba230308c7ddf06884ad9bba