Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778  -s ours am: a8c5964576  -s ours
am: 61632b84b6  -s ours

Change-Id: Ia891428b4b5b8c8269b793f85bf67f635f87579c